OB-5737-Remains-consistent