Merge pull request #3528 from eileenmcnaughton/api-sync