Merge "Fix crash caused by unhandled bucket" into rvc-dev