re #930 - Decreased last breakpoint
re #930 - Fixed compile error
Merge branch 'feature/930-breakpoint' into staging