[Hotfix] JT-1208