commit 26/04