Merge "Refactor the warning flags" into integration