Imported Upstream version 5.4.9
Merge tag 'upstream/5.4.9'

Upstream version 5.4.9