CON-1599 | Fixes after CR