Merged pull request. Update to v29 API