Merge branch 'ak/maint-for-each-ref-no-lookup' into maint