Merge branch 'master' into beta

Wait 5 sec.

Merge branch 'master' into beta