[Merge] From unstable
[Fixed] Old code
Merge branch 'master' into stable