commit 3.17