Merge "[BUGFIX] ConfigurationManager use FrontendSimulator only if neccessary"