Merge "Filter symbols by api-map" into main