Merge with buddycloud changes included