Merge "Require shortcut to bubble" into rvc-dev