Squashed 'apf/' content from commit ba0a94a

git-subtree-dir: apf
git-subtree-split: ba0a94a46fc39265a64d9594b4740e9a3ba1cc8c
Merge commit 'dfd4fa3832a813ddc2d64e59077a2a6853beb9c1' as 'apf'