Merged WFU modifications