fix: block overflow
Merge remote-tracking branch 'origin/stable'

Conflicts:
	src/clientiface.cpp