applied migration changes from 1f67a2ab4b6915f6b88821934d740e765161467a