Imported Upstream version 1.2.23