Added Genesis back to RCB, uninstall fixes
Merge remote-tracking branch 'origin'

Merge from online changes
Added Genesis back to RCB, uninstall fixes