Melodic migration

Merged Fernando Herrero requested to merge melodic_migration into master

Merge request reports