Standalone update, fix test
Merge origin/master into REST_TEST