merged devel_d into Devel