Rebellion update. Merged Hercules 19758ee

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>