[RBD-787]