[Hotfix] -LMX-1606