commit 12.26