Merge "Simplifying UniformMap updating" into devel/master