Merge "Suppress reflection errors and dedupe flags"