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