Devel merge update