Merge "Fix Kotlin safety build error" into main