Merge changes Id437e220,I9d6b3fba