Merge "Zen: Fix quantity format specifiers for quantity=1." into lmp-mr1-dev