Applying patch by Leonardo Tonetto
0001-Saving-acquisition-assistance-data.patch