556 Commits (lizzie/macos-fix)