BZ-12149: Merge chnages from the master