more patch changes for dir-655