Merge "Fix assigning void return value to a variable"