Merge branch 'sg/ref-filter-parse-optim' into maint