making changes to handle migration properly
Merge remote-tracking branch 'origin/s-havana' into s-havana