Summary: The patch for 8006088 misses regression tests after a merge error, this CR provides them.
Reviewed-by: jwilhelm, tamao, jmasa