Merged in recent changes from v1.65