Merge branch 'set-cache-on-user-tag-update' into 'develop'