[DoktrJones]

Thanks, the upgrade worked without problems, I did do a factory reset to be safe. The battery drain seems to be resolved now, it dropped only a few percent overnight. Guess I'll stick to the default settings.