#20977 Started doing stuff
Merge branch 'development' into i20977

Conflicts:
	config/locales/en.yml
	config/locales/ru.yml
#20977 Started doing stuff
#20977 Started doing stuff
#20977 Doing more stuff...
#20977 Almost done the stuff