Merge branch 'selectors' into m2