Merge "Onboard trunk namespaces" into main