merge RBD branch