Merge pull request #14645 from colemanw/noAmp