code simplification
synchronization with beta branch
Merge branch 'master' into tags-master
synchronization with beta branch
Merge branch 'master' into tags-master