OPAL-1642 - NPE in IndexManager
Merge branch 'master' of github.com:kazoompa/opal