Revert "Merge branch 'master' into filling-in-layout"

This reverts commit 930fcd8f07737ddccaf0edc0911a1ff923e2b851.
Revert "Revert "Merge branch 'master' into filling-in-layout""

This reverts commit cba6b7247b30ad491e3fb849ee407d67a4640ccb.