Merge "Remove the redundant @return comment to fix build warning" into main