[Hotfix] JT-1042