Merge branch 'ab/refs-errno-cleanup'