Refs #6765 change unit
Merge branch 'feature/6764_Sassena_units' into develop