Commit 17.5