merged module manager changes
pushed new build