Merge branch 'main' into development

# Conflicts:
#	src/common/api-config/api.config.service.ts
#	src/endpoints/blocks/entities/block.ts
#	src/endpoints/events/events.controller.ts

Author: bogdan-rosianu