[Hotfix] LMX-1266 | LMX-1268