Merge "Fix the incorrect behaviour when receiving a mismatched renew lease." into rvc-dev