Merge branch 'main' into push-command

# Conflicts:
#	pkg/content_manager.go
#	pkg/package_manager.go