Some more carousel tweaks.
Merge develop
Various performance/security fixes.