BZ-13180 merging cherry picked item