Merge "Fix sanitize address after scope" into rvc-dev