Merge "Force garbage collection after credential verification" into rvc-dev