Updates to include RAP 2.2.0