Merge pull request #20191 from colemanw/apiSettingsFixes