Merge branch '3646_filtered_view'