Added two more indices to gain performance
Added two more indices to gain performance
Merge branch 'master' into 1.5.0