Merge : Rework-Parsing-Clean branch after drift
Fix : New parameter type
Fix: #1346