158 Commits (master-patch)