Merged in lastest changes from v1.60