Undo for backward compatibility
Merge branch 'master' into beta