Merge remote-tracking branch 'dk/makeup'

Conflicts:
	component-selenium-grid.yml