merging dev/issue-6008-ss-polish into 1.0

Conflicts:
	src/MCPServer/share/mysql_dev1.sql