Merge branch 'sg/ref-filter-wo-repository'