Devel merge