Committing automated merge of v1.62-no-rpc/d06a3ab427 into