Auto-Merge pull request #3229 from mrunge/cppflags_backport