Potential fix for erroneous JIDE message

--HG--
branch : dev
Merge with default

--HG--
branch : dev