[fix][#30747] FTP layer throwing error on update
Merge remote-tracking branch 'origin/2.5.x' into 2.5.x