am d0c625f5: am d9f0e8f2: am ddda264f: Merge "Undef private *_BODY defines after use"

* commit 'd0c625f5de63e659e524710fe49ae1061d585dc6':
  Undef private *_BODY defines after use