Merged up-to-date upstream with your non-deprecated REST lib, yo!

Merged up-to-date upstream with your non-deprecated REST lib, yo!