[FIX]: replace local macros with code
Merge branch 'self-contained'

* self-contained:
  [FIX]: replace local macros with code