Added changes for 1.9.x