Merge "Update face with set and get features"