Merge "Change default units to be consistent in DefaultProperties.json"