Merge branch 'develop' into merge-develop-into-master

# Conflicts:
#	.github/workflows/release.yml
#	CHANGELOG.md
#	Makefile
#	make-linux-release.sh
#	poetry.lock
#	poetry/__version__.py
#	poetry/packages/locker.py
#	pyproject.toml
#	tests/packages/test_locker.py