Merge branch 'warning_fixes' into Fix_warnings-GF

# Conflicts:
#	CMakeLists.txt
8 jobs for Fix_warnings-GF in 10 minutes and 44 seconds