Merge branch 'check_cxx_compiler_flag_no_normal_variable' into release-3.20

Merge-request: !6318