Imported Upstream version 5.4.16
Merge tag 'upstream/5.4.16'

Upstream version 5.4.16
prepare 5.4.16-1 release