Apply changes from vibe-project/vibe-java-platform@1555c7a