Merge to feature/stabilization, fix idm-configuration.xml