merge fix for SWC-1386 to release-42