Merge branch 'fix_message_watch_hex_display_problems' into sprint71