Merge pull request #93 from apache/dev

[ISSUE #90] Merge `dev` branch into `main`