Update to RAP 2.2RC1