LPS-40602

c5724e9c needs to be backported

or I can manually send you ee-6.1.x version, let me know.