Committing automated merge of v1.63/b4d0474c03 into integ-home