Adding my comment here because I am experience th same issue and converting to MV2 is not an option