Revert "Revert "cmdev""

This reverts commit d2ebdb18dae0084a6cca3db262ad005689996908.