Merge pull request #13420 from carlyin0801/issue_13375_creative_env_os