Merge "Clear cache shell commmand" into tm-dev