re #878 - Improved migration
Merge branch 'feature/878-bin' into staging