Merge branch 'series-grid' into vnext

Conflicts:
	UI/Config.js