CON-907 | Fixes after CR / CON-986