Merge "api comment fixes"