Merged in changes from 0.65h-dc42