Merge branch 'bug/JAL-3703_saving_a_file_in_Windows_10_fails' into develop