[Hotfix] JT-1096