Merge "Fixed some @params documentation (includes/*)"