CON-775 Fixed