Simplified shuffle extension version (#2121)