[Hotfix] JT-1293