SWC-1615: merge from release-53