2 Commits (friedger-patch-2)