ConfiguratorParser updated
merged