Imported Upstream version 2.21