Merge branch 'tm/faster-current-tag'