#11821 Lockwood

Implement Texts and Links
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	index.html