Preparation to import new upstream
Imported Upstream version 1.4.17d
Merge tag 'upstream/1.4.17d'

Upstream version 1.4.17d
Refresh patches