Merging migration fixes from vbabiy