Merge "Fix shortcut flags" into rvc-dev