Merge Toro fixes into CM branch