Created by: KFilippopolitis
Cherry pick updated migration script 7.1
Created by: ThanKarab
Review: Approved
Merged by: ThanKarab at 2021-09-27 14:09:18 UTC