16 Commits (friedger-patch-2)