Merged with ui upstream