draft
draft copied to clipboard
Cherry-pick a4301a3 to get SOI support
Don't merge as is. Cherry-pick a4301a3!
This PR also includes my Winston Draft implementation, which I couldn't care to remove.