Merged with UI upstream.