CON-1486

Please resolve this TODO