Merge branch 'sb/check-return-from-read-ref' into maint