Tried to fix windows build.  Refs #7653.
Merge branch 'feature/7653_add_fp_peak9' into develop