pull SWC-536 down to develop from release-1.24