Capturing merge of misc-changes-please-integrate into v1.64-envdebug