Merge pull request #13468 from carlyin0801/issue_13467_public_var_yaml_fix