Imported Upstream version 2.3.4-2