Consume shared reorg

Consuming the latest changes in the shared repo (unstable20).