Merge "[refactor] Split the message macro in a standalone library for reuse" into main