Merge branch 'jt/tags-to-promised-blobs-fix'