Merge commit 'origin/core-1.0.2' into core