[Hotfix] LMX-1641