Update (ds)

Fixed: Incorrect breakpoint handling by framework