Merge branch 'ESTUP2-668' into CAUSEWAY-3745