Merge "Support creation of self-managed associations in shell" into main