Merge "Fix some more empty bubble issues!" into rvc-dev