Rel candidate to java_web

Synchronize release candidate with Java web