Merged across the WFCode changes from 107b