[Hotfix] JT-637