Merge remote-tracking branch 'ubi/development' into feat/cypress-defa…

…ult-conf

# Conflicts:
#	.gitignore
#	package.json
#	tests/main.test.ts
#	yarn.lock