Made changes to make it works, plus some cosmetic stuff

Nicolas MORISSET requested to merge (removed):develop into develop

Merge request reports