Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev