Merge "Spooler broken on upgrade." into klp-dev