Merge commit 'quintela/migration-next-v5' into staging