Completing merge of v3.9-0-rc1 compile cleanups
13 files changed