Updating master branch to silicon