dev commit 25 April