Merge branch '2821_wrong_second_ftp_connection'