Feature/5.0 upgrade

Francois Dziedzinlrequested to merge
feature/5.0-upgrade into develop

ref #3558

Merge request reports