with minor tweaks, r338025, from the original base commit: Remove unused and easy to misuse PNP macro parameter Obtained from: imp via cy