BZ-99999: merge RC changes