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