Updated with optimizing compiler from master