Merge in Raekkeris Changes