BZ-11776: Merger master changes that are missing