Merge "Revert "Revert "Revert "Revert "Add APIs that allow to exclude r...""