Merge "Suppress errors that are not needed"