Updating develop with latest API changes from master