Merge "Split ConfigurationController and ConfigurationForwarder" into main