Merged in rework_ui, resolved merge conflicts.