Devel branch maintenance