I would open up a ticket with support, if it is not much of a change they can modify the device support bundle for your version. They would also be able to see where exactly it is going wrong.