Imported Upstream version 5.4.13
Merge tag 'upstream/5.4.13'

Upstream version 5.4.13
release 5.4.13