Bug: cl#5170 - Correctly support on-fail=block for clones
Test: cl#5170 - Correctly support on-fail=block for clones