[Hotfix] JT-1210