Qt UI: sync with 2.3.x