Merge branch 'ab/sha1dc'