[Hotfix] JT-1028