MBS-6179: merge fixes again, since typing is apparently difficult to get right