Merge branch 'ab/mktag-tests'