Merge "Fix Kotlin warnings (controls)"