Merge pull request #14038 from annando/feature-constants