CA-100685

Part of the fix for SCTX-1302, already in clearwater, ported to trunk.