Merge branch 'fivetran-bugs'
Compile