Merge ../../devel/misc-tests