Hand apply 057cd247cacf5b99c626676d1f01a3c3dc3e3a15
Hand merging MAGN-1129.

Conflicts:
	src/DynamoUnits/Units.cs
More hand merging of 44ab2234801550a52a6225b0179ea53fe4400cfe
Hand merging ed4925930009dca2db1c1dd851f7b2557abab65b