Merge "Fixes the wrong error logs for shortcut ranks (false alarm)" into rvc-dev