Imported Upstream version 2.24