Merge branch 'relase'
Merge branch 'relase'
Freezing buttons fix.
Merge branch 'master' into relase