Merge branch 'jc/push-follow-tag' into next