Merge branch 'main' into staging#10

nullptr-t-oss merged 5 commits intomainnullptr-t-oss/java:mainfrom

stagingnullptr-t-oss/java:stagingCopy head branch name to clipboard