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