Command package merged with 1.8 code.