Merge remote branch 'origin/core-1.1.0' into core