more migrations post merge
more model-utils compatible changes