BS-2570, fix token creation when merged tokens doesn't have the same parent