Merge pull request #2628 from SergioCrisostomo/replace-feature-detect