Merge "Remove unnecessary warning options" into integration