[Hotfix] JT-862