Bring dev
launch to parity with legacy
#2319
Merged
dev
launch to parity with legacy
#2319