70 Commits (headless-fix)