hot fixed object_id
update regular redeem controller
Merge remote-tracking branch 'mannix/master'
merge mannix code jan-21
Merge remote-tracking branch 'stephen/master'