Merge branch 'common/core' into sh-latest