Fixes problems related to not working breakpoints (see comment at the top of the class) #KT-3291 Fixed