Feature/msp 11605/lazy thread creation

MSP-11605

# Pre-verification Steps
- [ ] Merge #4189
- [ ] Merge #4205 

# Verification Steps

## specs
- [ ] `rake spec`
- [ ] VERIFY no failures

## cucumber
- [ ] `rake cucumber`
- [ ] VERIFY no failures