[MERGE] merged the branch with the review of all search views