Merge branch '1814_empty_values_in_history'