Merge "Simplify PMF helper macro definitions across header files" into integration