Merge from stash
Merge from stash
Merge from upstream
Move generateing resources to src/gen/java