Add missing RBD functions to downstream backport