Fix ERM build
(-) there is one regression, but ERM is unused yet
Re add ERM to workspace
* To keep track of successful build