* commit '339f4022d0cf93622b4073f66d0ea066b822c118': Fixing issue with configuration states not being reset on configuration change.
* commit '339f4022d0cf93622b4073f66d0ea066b822c118': Fixing issue with configuration states not being reset on configuration change.