Merge branch 'patch/JAL-4119_sifts_ftp_split' into develop