Merge "Do not re-initialize synthetic password" into rvc-dev