Built apc-1114 from commit bc7c82a on branch master