Merge "Simplify RE validation"