Upstream merge
Use SNAPSHOT version for deployment of dev builds