Merge "Remove redundant cast" into main