Merge branch 'task/JAL-3174_fixed_filename_tests' into develop