Merge in latest changes from dattas