Fixtures scaffolding
Upstream merge