CAMEL-12104 was temporarily reverted via CAMEL-12409. We can re-apply CAMEL-12104 through reverting CAMEL-12409 now.
GitHub Pull Request #2374