WIP: Changed RestAdapter to new API
Manual Merge