Merge branch 'refs/heads/master' into release
Fixed minor error
Merge branch 'refs/heads/release'