Fixed - CON-833