Fix for MB-11165
Merge remote-tracking branch 'origin'