feat: merge `dev` into `main` #3132

Job	Run time
Guideline Blocks Settings CI (for checking compatibility with app-bridge)	2m 55s
app-bridge-ci	1m 43s
	4m 38s

Provide feedback