Merge branch 'AI2905-performance' into stable

Conflicts:
	config/initializers/view_paths.rb