APEX changes to support policy disable/enable and some improvements