Merge pull request #5520 from totten/4.6-cxn