Initial version with test #5841