commit 12.17