Merge branch 'tb/filter-alternate-refs'