Added changes for 0.86.