Ergonomic composite infrastructure

In progress

#735710

No attachments yet

Files added to this ticket will show up here.