Merge "Added Satellite messaging data support" into main