@pdraper I pushed this to my branch instead of a separate branch for you to inspect. Is that useful to cherry-pick to master ?