Not duplicate key elements (#179)
Merge remote-tracking branch 'origin/metawal-develop' into metawal-develop