rename alone to fallback; auto select while there is no selection
merge from master