[384] Pulling vital theme indexing patch onto master branch.