Trunk 4519 - Issue with moving autoExpireDates and autocalculation of duration