9 Commits (crueter-patch-4)