Merge pull request #7114 from annando/update-ap