Merge "Add missing @param and @return documentation"