Merge branch 'bug/JAL-3561_translatefileformats' into patch/JAL-3561_JAL-3660_filefor...