Merge "Kill off callback reference as soon as credential is verified" into rvc-dev