[Hotfix] JT-1078