Re: [Hotfix] JT-1096 / LMX-1492