[Hotfix] JT-1308