merge for idea-configuration-server