Merge branch 'machines-are-launch-configs' into development