[Hotfix] LMX-1228 - 2.0