Merge branch 'stable' into multicon

Conflicts:
	tests/setup_command.py

Port tests from stable branch to multicon