SWC-774: merge from release-7