Merges from feat-general-selectors-for-remove.