Merge branch 'main' into alt

# Conflicts:
#	added-by-them
#	added-by-us
#	file
