Fix whitespace (no functional changes).
Support midnam controller value labels.
fix merge with master