Merge "Adding a flag for improved wallet role icon and description fetching." into main