Merge branch '2917_cppflags_cleanup'