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