changes to correct shadow warnings
one further change and preprocessed files.
Merge branch 'fix_9113_2' into develop