first commit - sync with OFBiz OOTB