fix fail
fix actions in ctrl channel
Revert "fix fail"

This reverts commit a733356dab7e1d62e5e8cbec3fa7470257694089.
Merge branch 'master' into dev