Merge "More comments to doc strings"