Add mac_message (issue #4701)