KOTA-16: Added organization clinet initialization