[Hotfix] LMX-1573, LMX-1602