Merge "Reset target, update pointer" into rvc-dev