avoid using rebar non-API call
Merge branch 'pu' into new_model