Merge branch 'jc/name-rev-lw-tag' into maint