common master and develop history

Tristan Laurentrequested to merge
common-master-develop-history into develop

fix missings commit and unmergeable git history

Merge request reports