Merge "Prevent Kotlin NPE" into rvc-dev