Imported Upstream version 0.17.2