Imported Upstream version 2.22