merge latest changes from netflix oss master