merge changes for SWC-1219 and SWC-1224 into release-32