Merge "libincident: map remove extra '#'" into main