PLF-6154: Intensive usage of Organization Service