WIP: Development

Odair M.requested to merge
development into master

Merge request reports