55 Commits (friedger-patch-4)