[Hotfix] JT-833