Merge Raino's fork