Merge branch 'hotfix-speed-act'
hotfix today reg
Merge branch 'master' into develop