added commander window controller
merge from upstream