bug speed fix
Merge branch 'hotfix-speed-act' into develop