Imported Upstream version 2.26
Imported Upstream version 2.27