Merged in choosesync branch