add some logging, checking for empty xform id
Merge branch 'case-migration' into staging2