Merge branch 'ao/check-resolve-ref-unsafe-result' into maint