Merge branch 'release/1.6.1' into develop

* release/1.6.1:
  bump to v1.6.1
fix alias not applied in macro expansion
Merge branch 'hotfix/alias-macro-expansion'

* hotfix/alias-macro-expansion:
  fix alias not applied in macro expansion
Merge branch 'hotfix/alias-macro-expansion' into develop

* hotfix/alias-macro-expansion:
  fix alias not applied in macro expansion
bump to v1.6.2
Merge branch 'release/1.6.2'

* release/1.6.2:
  bump to v1.6.2