Merge "add breakpoint test to staging"