actions
Merge branch 'MBST-9831-feeds-console'

Conflicts:
	atlas-admin-frontend/version