Merge origin/master

First Version -  RC 1
Merge origin/master