Merge "Convert typecasting to new syntax" into main