Upgrade to Kotlin M9
Migrate periods to use JodaTime for time manipulation