Imported Upstream version 1.21