Merge "fix errata in comment"