Improve handling of multiple notified breakpoints
Reverting this code..
Increasing build version