Merged in changes from 0.78a-dc42 and 0.65k-zpl