Merge remote-tracking branch 'origin/core100' into next