Merge "Move filter_ref initialization"