Drop options check on index creation
Merge branch 'jdesboeufs-1.4' into 1.4