[Hotfix] JT-1026