Merge branch 'master' into 22-tidy-up-1-regular_lattice

1 job for 22-tidy-up-1-regular_lattice in 39 seconds