[Hotfix] LMX-1228