Merge remote-tracking branch 'upstream/devsite-with-java-layout-html' into devsite-with-java-layout-html