MB-9163 fixes