Merge "onboard nearby namespace" into main