Merge "Enforce satellite session metrics" into 24D1-dev