JWR changes

Change-Id: If3e84056f563d5a40a8b5cdd9b5a7b242f3a793b