LPS-42282 Adds removes reference in LPS-35952
LPS-42240 Reindexing spellcheck returns java.lang.NullPointerException errors in console