Refactor breakpoints
Merge branch 'enhancement/breakpoints' into development