fix macroexpand
Merge branch 'hotfix/macroexpand'

* hotfix/macroexpand:
  fix macroexpand
Merge branch 'hotfix/macroexpand' into develop

* hotfix/macroexpand:
  fix macroexpand
bump to v1.5.4
Merge branch 'release/1.5.4'

* release/1.5.4:
  bump to v1.5.4