Merge branch 'master' into develop
Fixed var message override
Bumped project version
Merge branch 'develop'