2.4.x :: RBR support