Import upstream updates to UI

Edited by Sebastian