Essentially HSEARCH-4845 Pull Request Sent , but as an option, and disabled by default.

I suspect this will be necessary for integrators such as EAP which need these incompatible change ADAP due to their release schedule.