merging from gx-0.8 to trunk