Merge "Made default units consistent in deprecated DefaultConfig.h"