Merge remote-tracking branch 'quintela/migration-pull' into staging