SWC-1828: merge fix to release-64