SWC-774: merge from release-7 (change also merged into release-8)