Merge "Remove unnecessary body assignment"