Updated with latest changes from v1.64