Merge pull request #1111 from jay-hodgson/release-54

SWC-1615: merge from release-53
fix make public/private button
Merge pull request #1114 from jay-hodgson/SWC-1621

SWC-1621: fix make public/private button
SWC-1629 and SWC-1630