Merge "Fix compilation issues with new kotlin compiler"