Merge "Fix notes which differnt from actual parameters"