Major bug fixes in new endpoints
Merge remote-tracking branch 'origin/master'