[Hotfix] JT-1097