Merge remote-tracking branch 'origin/new_features' into new_features

Conflicts:
	.idea/workspace.xml