Merge commit 'origin/core-1.0.0' into core