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

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