HHH-7928 - Regression caused by HHH-6361