Merge "Correct the offload capability and update comment"