Merge remote-tracking branch 'upstream/main'

# Conflicts:
#	package-lock.json
#	package.json

Author: qwertychouskie