Merge "Fix issue #37220301: Allow broadcasts with permissions to not be restricted" into oc-dev