CLI: support a timout option
Update the Changelog