Merge pull request #13260 from neheb/apdep