merged clover-related changes from branch "trunk-gd" (with some corrections).