Allow to disable APC
(cherry picked from commit bb73967e3742e3f8cc1307611c14f99bb2d561d9)