Lastest changes for 8.5 release