Adding code for 13.10 release