Correction of bugs ending Dev017...
Cleaning sources before commit and merge