Migration / Fix error when migrating harvesters.
Merge remote-tracking branch 'origin/develop' into develop