Merge pull request #1234 from vponomaryov/ccm-make-stop-op-have-default

Merge pull request #1234 from vponomaryov/ccm-make-stop-op-have-default #3387