Merge "Add a new condition provider for manual rules" into main