Merge remote-tracking branch 'origin/bug/JAL-3141_Messages_discrepancy_fix' into...