[GNU-692]
1 regression 3 fixes
Details: http://54.172.246.49:9090/jobs/tcwg_gcc_check--master-aarch64-build/builds/10035/archive/artifacts/notify/mail-body.txt