fixed activation
Merge branch 'fix-activation' into develop