Merge "No variable assignment on return statement"