MBS-6179: merge fixes