I think this is fixed in 5.2.12 by HHH-11838 Closed .
Please not that this may end up getting broken when HHH-12034 Open is fixed. When that happens, you will probably need to opt-in to this functionality by setting a configuration parameter.