17 Commits (patch-3)