Merge "Remove left-over wipeData() call" into rvc-dev