Imported Upstream version 5.4.17