Imported Upstream version 5.4.17
Merge tag 'upstream/5.4.17'

Upstream version 5.4.17