Upmerge of work done.

Putting this aside.