Merge branch 'master' into 'main'

Allow conversion near multiple firedrake boundaries

See merge request !112