Fix problem for inactive SaveRateOpt
Merge branch 'GSOC-Analyzer' into GSOC-Integrator
Merge branch 'GSOC-Integrator'