Merge "Added selection dialog for rule generation"