CLOUD-332 added heterogen support