Revert "Revert "CU-600""

This reverts commit a628da0b043238937e7cf939a093aee0faeda756.