DATASOLR-183 - Prepare next development iteration