+ Registry: Allow INDEX override Upstream-commit: d8bf5af79be9b2dfff671742039a24c37e8b28c3 Component: engine