Merge branch 'users/nikhil/fixSBpublishing' into 'master'

Closed David Diederich requested to merge cherry-pick-da40067b into release/0.16

Original MR: !221 (merged)

Merge request reports