1024b041
* commit '1024b041e824bb6eb232971fc4a2984d63f7e079': Part of fix for double spins & faster startup