Manually incorporate changes pending from modulesync