Do not modify passed in feature on register/unregister
Merge remote-tracking branch 'origin/master' into NX-698-react-on-controller-changes