Merge "Remove breakpoints from redefined classes"