Retain the active component: refs #572
Retain the active component: refs #572
Retain the active component: refs #572
Retain the active component, After resolving conflicts: refs #572