Merge pull request #13397 from carlyin0801/issue_13396_creative_atom_os_query_fix