BS-2570, support and gateway: now we can merge two tokens without a parent