Merge "Fix debugger missing handle between adding and tagging object."