Port fix for CLC-3645 into CLC-3638 WIP branch