Design update 2

Pulled latest-latest production upstream, addressed conflicts.