Fixed activation error
Merge branch 'refs/heads/dev-1.3.4'

* refs/heads/dev-1.3.4:
  Fixed activation error