Merge "Use IResultWrapper in code comments instead of ResultWrapper"