Add --macro-number option
Merge branch 'feature-macro-number-option' into release-0.27