Merge "Revisit (add|remove)_subports request body"