RBF support ported from OF 1.6-ext to 2.2.x