Merge remote-tracking branch 'origin/feature/engine-integration' into feature/engine-integration