Add a tag in dev branch
Change local dev branch
Merge branch 'master' into dev