MB-9163 Fix 1