Merge branch 'bug/JAL-3158selectionBroadcasts' into merge/JAL-3158