Yet another refactor to TnoMigrateController
Merge branch 'refactoring' of github.com:TNO/GSCF into refactoring