code formatting: synchronization with master branch
code formatting: synchronization with beta branch
Merge branch 'master' into beta