fix action log
Merge branch 'master' into prod

* master:
  fix action log