Take latest sdp
Merge branch 'parse_multiple_messages' into dev