Merge "Update SO API for freeradius_nbi gating test"