SKIPME Pickup recent bug fixes from Apache branch-0.9