Add new lang and fix somes issues related to PS 1.4 version
improve import orders and fix some issues
Backward compatibility put back
Merge branch 'elmahdi-master'