Imported Upstream version 5.4.15
Imported Upstream version 5.4.16