Added patch to allow saving for D6 upgraded content