[GNU-692]
1421 regressions 2 fixes
Details: http://54.172.246.49:9090/jobs/tcwg_gnu_native_check_gcc--master-aarch64-build/builds/10187/archive/artifacts/notify/mail-body.txt