am dadc0ddb: Part of fix for double spins & faster startup

* commit 'dadc0ddbfe309086801b479ddc91c55eeb2a9cbb':
  Part of fix for double spins & faster startup