commit 25/09