#25028
Merge branch 'master' into development

Conflicts:
	assets/javascripts/usability.js