3.5.0 rest adapter with3.4.x merge

Porting all changes made in 3.4.x (including the new rest adapter proxy) to master (3.5.0)