Built apc-1114 from commit a50615c on branch master