Merge branch '2228-new-column-in-the-overlay-data-file-called-source_data' into 'master'

Resolve "new column in the overlay data file called 'source_data'"

See merge request !1883