Merged Bug-261 Fix into 6.0 branch