Merge pull request #10609 from totten/master-case-settings