am b93ce4ae: Merge "Several API changes as requested by ES:"

* commit 'b93ce4ae861f86eb86bc52a8444be7abd5f538d4':
  Several API changes as requested by ES: