DATASOLR-141 -Prepare next development iteration.