Imported Upstream version 3.0.21