Merge "Kotlin 1.5.31 compatibility" into sc-v2-dev