Merge pull request #4168 from xmcclure/aot-man