Merge branch 'core110'