Merge branch 'main' into feature/nashorn-test