feat: Adjust and merge upstream #8837(Content sort filter framework)