Merge remote-tracking branch 'origin/dev-core' into dev-core