synchronization with master branch
Merge branch 'beta' into beta-ics