Rii wrapper-master integration