Added api client auth
Merge