SWC-556: merge down from release-1.24