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