Merged from dev, sans FaceApp.