MAIN-2681 CR fixes