Allow migration 3.6x to 3.7.0