CLOUD-216 distinguish the 2 different stacks mapping