Imported Upstream version 5.6.22