[Hotfix] JT-826