commit 25/11