fixed issue: https://github.com/ecomfe/edp/issues/312
FIX ecomfe/edp#312
Merge branch '1.0/develop' into 1.0/release
bump to 1.0.17-beta.4