[3.8] Move patch to migration