Merge branch 'optimize_apc_check'