Merge branch 'rc/for-each-ref-tracking'