Merged with ui upstream
Added encytion