Merge branch 'devmap_hash'