- Trim Makefile headers - Update COMMENT - Add CONFLICTS PR: 178161 Submitted by: Matthias Petermann <matthias@petermann.it>