Merge from branch 1.1 :
- missing files
- issues introduce during merge from upstream