Built apc-1114 from commit d698199 on branch master