BZ-9999: merge with master