API updated with changes from commit 2aa0486
WEB-388 more or less all the tests from these changes are passing