BZ-99999: merge RC changes
BZ-99999: merge RC changes