Merge "Fix wildcard scene edges" into main