Include Serdar's revision to the UI.
Merge remote-tracking branch 'origin/master'