Merge "Use trace macro with message generator function" into devel/master