Commit André Ferreira's changes
Bring back fix for carousel