[Hotfix] LMX-1640