Merge "Protect broadcast used in settings for bond cancel" into oc-dev