ecomfe/edp#296
Merge branch '0.6/feature/296' into 0.6/release
bump to 0.6.0-beta.4