cl/gcc-adapt-ext: Minor code refactoring n.1 ...
Merge branch 'extension/minor-code-refactoring-1' into cl/gcc-adapt-ext