commit 25/06