2 Commits (friedger-patch-7)