Sync sources and debug as well

Merged Alex Iribarren requested to merge dev into master

Merge request reports