[UPDATE] Update to APM master