Merge branch 'dj/fetch-tagopt' into maint