FIX: Index controler require fix
Merge origin/master