Fix for map equality
Merge branch 'master' into hotfix/map-equality
Merge branch 'hotfix/map-equality' into develop