Merge pull request #13377 from micmac1/apa-faker