I'm not sure how to handle this issue since it was fixed in 5.4.0.CR1 and reverted by HHH-13217.
There is no reference of HHH-12653 in the changelong.txt either.