Merge branch 'jk/make-tags-find-sources-tweak' into maint