An error occurred
* Reinstate most of commit 09304db9a5 * Move the behaviour behind a config setting * Also fix the initial #12365 An error occurred
09304db9a5