[DEP-16] PR3 - After merge branch 

Our source is up to date, everything should be fine now with merge.