WIP: Collection of recent model updates

Closed Luis Aleixo requested to merge development/model_update into master

This merge request is to guarantee a staged review of all of the model updates with MR coming from the development folder.

To be merged only when all the updates are reviewed - sub merge requests approved:

Merge request reports