Merge pull request #2383 from joto/disable-ct-msg

Merge pull request #2383 from joto/disable-ct-msg #1400