Merge "Add Java doc comments on script group name reuse"