Fix index creation when running in safe mode
Merge branch 'index' into blackboard