* commit 'b60a62ca88eb73c7cdf45f75587db3cb68fbd978': Fix issue #16794553: Duplicate ArrayMap entries in Bundle...