Fix: Use externalid instead of name in Map
Merge remote-tracking branch 'origin/kk-dev' into development