[Hotfix] JT-1304 + LMX-1616