Merge changes I0e30376d,I7b95f664 into stable/boron