Merge "Fix warning: macro redefined"