Attempting to master<->dev merge. Using master map and uniform.dmi.