chore, respect UNUSED macro semantics
Merge branch 'bld/dist'

* bld/dist:
  chore, respect UNUSED macro semantics