8 Commits (fix-spectral-hack)