Merge remote-tracking branch 'origin/feature/6017_improve_peak_fitting'
Merge remote-tracking branch 'origin/feature/3219_forget_property'
Refs #6885. Fixing parameter lookup.
Merge branch 'bugfix/6885_dgsred_tib_issue' into develop