Update pr #2494 by adding specs.