Merge "Enhancement for Satellite TestApp" into main