Merge "Improve error message if secondary index support is disabled"