[GNU-1953]
351 regressions 2 fixes
Details: http://54.172.246.49:9090/jobs/tcwg_bootstrap_check--master-aarch64-check_bootstrap-build/builds/10155/archive/artifacts/notify/mail-body.txt