fix performance differences when CPR macro off and CPR on but config

flag off
Status Job ID Name Coverage
  External
passed jenkins