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

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