Added element ids and merged dictionary changes
Merge remote-tracking branch 'origin/Development2' into Development2