Merge branch '2821_wrong_second_ftp_connection' into 4.8.1-stable