Merge branch 'main' into col-normalisation #2443

Job	Run time
Create patch version number and push to test-pypi	52s
	52s

Provide feedback