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