CON-1809 | Fixes after CR