CON-1379 | Fixes after CR