Merge pull request #5051 from neutrinoceros/rfc/match_geometry #1837

# to view logs

Job	Run time
tests with bleeding-edge crucial deps	9m 54s
Create issue on failure	0s
	9m 54s

Provide feedback