* Improve data gathering * Refactoring * On server restart, only reset if hanging in LOCKED_DATA_GATHERING state * Update changelog