Merge new parameters (research branch) into master

[Masterxilo]

@MaryamZaheri please merge research branch into master (I guess you are best positioned to fix the merge issues), so that we can take advantage of the latest features/fixes as well as these parameters. Thank you!