Propagate fixes and improvements from main carousel repository.
Add editor config