Merge "Removes duplicated filter setting" into main