am 6326f964: Merge "Make application/client id an object"

* commit '6326f964769c603382ee6694b33954b4ff9b9a52':
  Make application/client id an object