Update to RAP 2.3.1

Change-Id: I67aee0be9375326bd68c28e2344d7e5b3c0d7bbc