initial merge of ordermgmt branch from Mark Gajudo