Merged with ui upstream.
Reverted back db diff generations.