Selector window only
Merge branch 'SelectorWindowOnly'