Merge "Apply the same filtering for docstubs and jarstubs"