BZ-11814: merge fixes