Fixed - CON-955