Merge changes I220c5a0e,I9f5dca23,Ibf5628f6 into stable/carbon