Merge remote-tracking branch 'origin/res-manage' into res-manage-v2