[Hotfix] JT-618