Merge pull request #11567 from eileenmcnaughton/api_custom