Can control event

Fixing PR #982 and making it go to master instead of minor.