synchronization with ics branch
Merge branch 'master' into beta