Apply changes from vibe-project/vibe-java-platform@5cc3f7b