Merge "Remove depricated flags and add fix missing"