BZ-9999: Merge with master