Merge "Make application/client id an object"