merge devs of OWS-10; some module dep refac