2.4-develop
Merge remote-tracking branch 'origin/ACP2E-4353' into PR_2025_12_03_chittima
ACP2E-5052: Deadlock error on product query