1132642 - put back --macro-mapping to 'all'