CON-747 | Post-merge fix